(server-switch-buffer): Only switch window if the current one is dedicated.

diff --git a/lisp/server.el b/lisp/server.el
index 1e7d51692cb9c83cb3fceee8da1d261d7161cc93..54e452f65262bc8829e8b31f6947b7ef75f0ce53 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -507,8 +507,9 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
   (if (window-minibuffer-p (selected-window))
       (select-window (next-window nil 'nomini 0)))
   ;; Move to a non-dedicated window, if we have one.
-  (select-window (some-window (lambda (w) (not (window-dedicated-p w)))
-                             'nomini 'visible (selected-window)))
+  (when (window-dedicated-p (selected-window))
+    (select-window (some-window (lambda (w) (not (window-dedicated-p w)))
+                               'nomini 'visible (selected-window))))
   (set-window-dedicated-p (selected-window) nil)
   (if next-buffer
       (if (and (bufferp next-buffer)